Merge: minor issues caught by GCC 4.6.0.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 06:18:50 +0000 (23:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 06:18:50 +0000 (23:18 -0700)

Trivial merge